Removed unused portions, cleanup styles