Code formatting, removed some files from common etc.