changed identation using lint and more element basic operations..