organized imports and removed private static constants that were unused.