Fixed API version + Source code cleanup