Removed unused local variables
Code cleanup & code style