round off some rough edges to greatly increase maintainability
round off some rough edges to greatly increase maintainability