Remove unecessary variables and operations, simplify things a little
Fix case where attribute doesn't need to have a value
Add space
Merge pull request #1 from tannwestlake/cc/optimisation

Remove unecessary variables and operations, simplify things a little