Code cleanup
Implemented AND