Cleaded up source files