Removed empty files and fixed coding style issues