Cleaned up. Splitted activities