All redundant classes and methods in lined.
logic of brackets improvised.