Cleaned Import / being picky about layout