Fixed naming conventions and stuff in sensors; removed usless variable