Fixd bugs
Formatted all files