Clean up code
Fix some formatting
Use variable