Code refactored
Git ignore updated