Initial code review of current code base

Same goes for rest of file/files