Changed pickup constants name, javadoced some the code functions