#31 - Removed doubled code, changed shortcuts