Fixed Naming Convensions and added to Bunker class

Removed some duplicate or unneeded variables
Minor bug fix